projects / gtk4.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c149ce5)
Use italic instead of oblique in font aliases.
authorAlexander Larsson <alexl@redhat.com>
Tue, 5 Dec 2000 09:47:13 +0000 (09:47 +0000)
committerAlexander Larsson <alexl@src.gnome.org>
Tue, 5 Dec 2000 09:47:13 +0000 (09:47 +0000)
2000-12-05  Alexander Larsson  <alexl@redhat.com>

* gdk/linux-fb/gdkpango-fb.c:
Use italic instead of oblique in font aliases.

* gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
_gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
other unsupported functions.

ChangeLog patch | blob | history
ChangeLog.pre-2-0 patch | blob | history
ChangeLog.pre-2-10 patch | blob | history
ChangeLog.pre-2-2 patch | blob | history
ChangeLog.pre-2-4 patch | blob | history
ChangeLog.pre-2-6 patch | blob | history
ChangeLog.pre-2-8 patch | blob | history
gdk/linux-fb/gdkpango-fb.c patch | blob | history
gdk/linux-fb/gdkrender-fb.c patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3e10b99ce732d0caa78a8a607a2a9dba11b8303b..787eedb34045b2f56f6837c8aee22bc02c1cdabb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2000-12-05  Alexander Larsson  <alexl@redhat.com>
+
+       * gdk/linux-fb/gdkpango-fb.c:
+       Use italic instead of oblique in font aliases.
+       
+       * gdk/linux-fb/gdkrender-fb.c (gdk_fb_fill_span_generic,
+       _gdk_fb_gc_calc_state): Support GDK_XOR, add g_warning for
+       other unsupported functions.
+
 2000-12-04  Havoc Pennington  <hp@redhat.com>
 
        * gtk/gtkpaned.c (gtk_paned_expose): fix this to be sane
diff --git a/gdk/linux-fb/gdkpango-fb.c b/gdk/linux-fb/gdkpango-fb.c
index 1d8689d18771cc41fecb5d74e66d941c9de8098f..850d6608bbde13b3a13bf1d311332e358002e659 100644 (file)
--- a/gdk/linux-fb/gdkpango-fb.c
+++ b/gdk/linux-fb/gdkpango-fb.c
@@ -64,10 +64,10 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Sans", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+    {"Sans", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     {
-      {"Arial", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
-      {"URW Gothic L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"Arial", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"URW Gothic L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     }
   },
   {
@@ -78,9 +78,9 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Sans", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+    {"Sans", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     {
-      {"Arial", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+      {"Arial", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
       {"URW Gothic L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     }
   },
@@ -94,10 +94,10 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Serif", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+    {"Serif", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     {
-      {"Times New Roman", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
-      {"URW Bookman L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"Times New Roman", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"URW Bookman L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     }
   },
   {
@@ -108,10 +108,10 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Serif", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+    {"Serif", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     {
-      {"Times New Roman", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
-      {"URW Bookman L", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+      {"Times New Roman", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+      {"URW Bookman L", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     }
   },
   
@@ -124,10 +124,10 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Monospace", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+    {"Monospace", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     {
-      {"Courier New", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
-      {"Courier", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"Courier New", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
+      {"Courier", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_NORMAL, PANGO_STRETCH_NORMAL},
     }
   },
   {
@@ -138,10 +138,10 @@ static PangoFBAlias alias_table[] =
     }
   },
   {
-    {"Monospace", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+    {"Monospace", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     {
-      {"Courier New", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
-      {"Courier", PANGO_STYLE_OBLIQUE, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+      {"Courier New", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
+      {"Courier", PANGO_STYLE_ITALIC, PANGO_VARIANT_NORMAL, PANGO_WEIGHT_BOLD, PANGO_STRETCH_NORMAL},
     }
   },
 };
diff --git a/gdk/linux-fb/gdkrender-fb.c b/gdk/linux-fb/gdkrender-fb.c
index ab6610e54235cc8e4fa80e567258b4016a947a37..b431c7d2fae4068be8d50d097b8187e6b4c628b3 100644 (file)
--- a/gdk/linux-fb/gdkrender-fb.c
+++ b/gdk/linux-fb/gdkrender-fb.c
@@ -443,6 +443,15 @@ gdk_fb_fill_span_generic (GdkDrawable *drawable,
          spot.green = ~spot.green;
          spot.blue = ~spot.blue;
        }
+      else if (func == GDK_XOR)
+       {
+         (gc_private->get_color) (drawable, gc, curx, y, &spot);
+         spot.pixel ^= gc_private->values.foreground.pixel;
+       }
+      else if (func != GDK_COPY)
+       {
+         g_warning ("Unsupported GdkFunction %d\n", func);
+       }
       else if (ts)
        {
          int wid, hih;
@@ -1165,7 +1174,7 @@ _gdk_fb_gc_calc_state (GdkGC           *gc,
   if (!gc_private->values.clip_mask &&
       !gc_private->values.tile &&
       !gc_private->values.stipple &&
-       gc_private->values.function != GDK_INVERT)
+       gc_private->values.function == GDK_COPY)
     {
       switch (gc_private->depth)
        {
Unnamed repository; edit this file 'description' to name the repository.